From: Dan Winship <danw@gnome.org>
Date: Thu, 22 Sep 2011 19:45:21 +0000 (-0400)
Subject: keyboard: fix D-Bus name acquisition flags to totally block Antler
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~7570
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=5adb5411fa3d587b44026afee788cc40726ab6f7;p=gnome-shell.git

keyboard: fix D-Bus name acquisition flags to totally block Antler

We never want the antler keyboard to run if gnome-shell is running, so
grab org.gnome.Caribou.Keyboard without the "allow replacement" flag.

https://bugzilla.gnome.org/show_bug.cgi?id=659865
---

diff --git a/src/main.c b/src/main.c
index 0c505e78b..503f8a1fc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -120,7 +120,7 @@ shell_dbus_init (gboolean replace)
   /* ...and the on-screen keyboard service */
   if (!dbus_g_proxy_call (bus, "RequestName", &error,
                           G_TYPE_STRING, "org.gnome.Caribou.Keyboard",
-                          G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags,
+                          G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING,
                           G_TYPE_INVALID,
                           G_TYPE_UINT, &request_name_result,
                           G_TYPE_INVALID))